Auto merge of #1183 - parkr:patch-1, r=wycats
authorbors <bors@rust-lang.org>
Sun, 18 Jan 2015 18:25:21 +0000 (18:25 +0000)
committerbors <bors@rust-lang.org>
Sun, 18 Jan 2015 18:25:21 +0000 (18:25 +0000)
commitd100bef931843fcee27bfb76655d8952857e5553
tree5bad7085765576cd553dd3f6899942df6beeaba9
parent31a2ce75e1e7aa4eefa03d64ada6870ab9a18136
parent95e8b4713437b9c2f20953c6c752169a78030f4f
Auto merge of #1183 - parkr:patch-1, r=wycats

This seemed a little crucial.